From d42d8a317ec24e150732d0df31a7653f8dd9f5d0 Mon Sep 17 00:00:00 2001
From: Jimi Xenidis <jimix@watson.ibm.com>
Date: Fri, 1 Sep 2006 12:19:41 -0400
Subject: [PATCH] [POWERPC][XEN] remove dead preemption code

Signed-off-by: Jimi Xenidis <jimix@watson.ibm.com>
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
---
 xen/arch/powerpc/exceptions.c | 30 ++++--------------------------
 1 file changed, 4 insertions(+), 26 deletions(-)

diff --git a/xen/arch/powerpc/exceptions.c b/xen/arch/powerpc/exceptions.c
index b325026192..880aa93068 100644
--- a/xen/arch/powerpc/exceptions.c
+++ b/xen/arch/powerpc/exceptions.c
@@ -16,6 +16,7 @@
  * Copyright (C) IBM Corp. 2005, 2006
  *
  * Authors: Hollis Blanchard <hollisb@us.ibm.com>
+ *          Jimi Xenidis <jimix@watson.ibm.com>
  */
 
 #include <xen/config.h>
@@ -23,11 +24,9 @@
 #include <xen/sched.h>
 #include <xen/serial.h>
 #include <xen/gdbstub.h>
-#include <public/xen.h>
 #include <asm/time.h>
 
 #undef DEBUG
-#define HDEC_PREEMPT
 
 extern ulong ppc_do_softirq(ulong orig_msr);
 extern void do_timer(struct cpu_user_regs *regs);
@@ -38,31 +37,10 @@ int hdec_sample = 0;
 
 void do_timer(struct cpu_user_regs *regs)
 {
-    /* XXX this is just here to keep HDEC from firing until
-     * reprogram_ac_timer() sets the proper next-tick time */
-    mthdec(timebase_freq);
-
-#ifdef HDEC_PREEMPT
+    /* Set HDEC high so it stops firing and can be reprogrammed by
+     * set_preempt() */
+    mthdec(INT_MAX);
     raise_softirq(TIMER_SOFTIRQ);
-#endif
-#ifdef DEBUG
-    {
-        int d;
-        if (regs->msr & MSR_HV) {
-            d = -1;
-        } else {
-            d = get_current()->domain->domain_id;
-        }
-        extern char serial_getc_nb(int handle);
-        if (0 && serial_getc_nb(0) > 0) {
-            printk("H: pc: 0x%lx lr: 0x%lx \n", regs->pc, regs->lr);
-        }
-        if (hdec_sample)  {
-            printk("H: pc: 0x%lx lr: 0x%lx \n", regs->pc, regs->lr);
-            hdec_sample = 0;
-        }
-    }
-#endif
 }
 
 void do_dec(struct cpu_user_regs *regs)
-- 
2.30.2